Aesthetic cleanups