Commit #9

Well here more stuff.

* Removed off topic changes.
* Updated to meet coding conventions