Changed variables to camelCase