Uncomment parts of code and fix space issue