removal of print statements \ code cleanup