refactor, cleaning out print statements