Remove print statements and fixing formatting