little code re-org