linted
renamed functions