Aesthetic changes
Through part 10b of tutorial