Naming and style changes (now passes JSHint)