Cleaned up some long lines
Cleaned up some indentation