Refactor c&d