Turn the dump()s back off for hopeful deployment
Fix spaces
Better comments
Refactor and neaten