Tidied up comments and docs