Removed comments and unneeded print statements