changed variable names to camel case