init branch
style improvements
Merging master --> hotfix/style-fixes
Merge pull request #148 from tickit-project/hotfix/style-fixes

Hotfix/style fixes