clean up, re-organization