Codestyle

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #5, #151
| License       | MIT

I resurrected the cs cleanup started by @sjopet , merged master and resolved conflict, and fixed the open issues i found. lets try to merge this one fast to avoid more conflicts.