Refactor, camelCasing, indentation change