Some style changes
Some style changes - v2
Some style changes - v3 - temp