Removed all print statements and some cleaning up