Removed some whitespace, uncommented a chunk of code I accidentally left
commented out, fixes #45