Merge pull request #2 from rivimey/feature/codestyle-updates

Code formatting changes