Some codestyle fixes
Improved the documentation