Small corrections and removing print statements.