Refactoring
Additional refactoring; output modification