Removing print statements - using logger