Simplify code, add whitespace after regex-derived content
Allow arbitrary data after a label and complete readme