Refactor deck comments to doctrine