refs #42 — refactoring
refs #46 — Output refactoring
refs #46 — The great renaming spree