Readability fixes and beautification.