tidying up with some clarifications