clean up code, refactor method names