Code clean, part 2. Huzzah for formating!