Making picky people happy :)

Slight refactor