Remove extraneous prints; clean code