Refactor - remove print statements