tidying up, renaming for clarity