Aesthetic code fixes