removed some extra lines and commented out code