Shortened codebase by 16 lines

Had tons of extra work in the original. I had piss-poor coding skills a year ago.  Could be shortened more, but that'd be ugly.