Aesthetic code cleanup