clean up and refactor
rename method