Cleaned up some stylistic things.