just some re-organizing