clean code

[niko132]

At the moment the compiler shows a lot of warnings because of semi-good code style.

TODO: write clean code!