got rid of a few unnecessary lines