Fix some code style issues
Revert assignations alignment

Fix a few missed code style problems
Merge pull request #47 from Triiistan/fix-code-style

[RFR] Fix some code style issues