Refactoring; better operation display