Merge pull request #202 from thogil/infrastructure-rework

Styling updates
Merge pull request #205 from thogil/infrastructure-rework

Sync with master