Small style changes (mainly to the way some variables were named.
Merge branch 'styling' into develop