Whitespace/indentation and more consistent naming.