organizing some methods.    NO OPP CHANGES