Killed some whitespace
Cleaned up module code