Refactor to use move object rather than comments.