Tidy up code style and docs a little bit