1. Random tidiness cleanups