Refactor output to separate class
Refactor OutputLine into separate class