[BACKLOG-407] - Check styles cleanup
Merge pull request #498 from wseyler/dev

[BACKLOG-407] - Check styles cleanup