cleaned up and removed extra lines