coding standards and closer to the core one
Merge pull request #1 from dereuromark/master

rewrite/cleanup