Code neatness

Fixes my insanity issues.