minor simplifications/re-use in classes