Refactor paper trail