Cleaned up some code to fit in 100 columns.