refactoring; output
fix