Removed print statements and minor fixes