- changed functions to camelcase