Some simple code cleanup

Clears up some whitespace and unneeded code.