renamed some functions to camelCase