Code cleanup + turned logging off