Updates to match coding conventions
 - whitespace updates - starting braces on same line
 - space before method parens
 - underscores in method and variable names
 - no hungarian conventions or camelcase variable names
 - qualify members with 'this'