Cleaned up a few straw lines