Some cleaning

Cleaning some small parts of the code. It is already very clear and simple to read.
Just a few suggestions :)