Minor style changes

Minor style changes and variables names.

Nothing important, I hope...