Tidying up character creator