linting fixed things
better function names