Clean up comments to not be "inline", as requested by @astrofrog
Implemented a variety of changes based on comments by @taldcroft, @mdboom, and @Cadair