Cleaned up some long lines
Cleaned up some more long lines