Refactor and add todo for CD in Album