switched all variables to CamelCase