Minor style updates
Merge branch 'calFix' into dev