updated style
Merge branch 'feature/style' into dev