Cleaned up some things just to make it more readable.