Some clean up and some doco