Major tidy up of the main TARDIS class