Pilot: Cosmetic and Code Cleanups