Tidy up and fix following restructuring