Refactor output functions
Merge pull request #31 from mickboldon/dev

Refactor output functions