cleaned up a few lines