A few style tweaks and better comment integration.