re-arranged output code blocks, commented individual creation out