Fix for Travis Failure

Fix for travis failure
Indenting files
removing comments