Cleaned up some formatting, indentation and such.