Clean up style and comments a bit.