Style cleanup

Catering towards greater readability and general realignment towards
our overall brand