Cosmetic/code cleanup