removed some puts and commented out code