Minor changes

* Fixed identation
* Make some parts of the code more readable.