Tidy up so now that everything compiles correctly