Made a bunch of small style changes
Merge branch 'rc' into dev