cleaned upthe commented out code