Cosmetic, comments and cleanup.