Code cleanup

made if statements look the same, cleaned up whitespace, deleted
commented out code that was old