Cleaned up formatting and whatnot after #3.