Refactor into several, smaller functions
Merge remote-tracking branch 'bruceadams/just-refactor'
prepend newline to each section