removing print statements, cleaning