styling
More styling
Merge pull request #21 from ne0n666/master

Styling, some fixes