Tidy up and documentation
Clean up of names that weren't statically imported