renaming methods
clean up unnecessary code