Reformat code
Implementation & styling comments section
Merge pull request #2 from hofmannsven/dev

Dev