code cleanup, removed annoying puts