Refactor and echo subject when COMPing