cleaned up code, deleted unnecessary lines