Coding conventions

rename camelCase variables and fix ( this )