camelCase the variables
cleanup some line lengths and indents