Tidy up the code and remove show references from the docs.