Many functional unimportant code style fixes

Code styling fixed in the 6 biggest files. 
There's a big potential for a collision with another pull request.