OCD cleanup

Becaus I hate Gian's coding *scheme*, lel.