Cosmetic changes, cleanup