Conformed code to camelCase and renamed some things