Cleaned up formatting
Merge remote-tracking branch 'min_max/master'