TIdying up for a cleaner install