Whitespace and variable naming fixes