refactored OutputService a bit