Removed blank space and break lines above 70 characters

In order to make the pull request more legible, I put in a different branch the part where I "clean up" the code.