Further whitespace issues
Remake as Module