some re-arranging for orderliness and for live-coding goodness