Removed print statements for debugging and general cleanup