Styling changes

Styling changes implemented after code review by @Rumyra