renamed and re-ordered method

seems more appropriate this way