Reorganise encrypted content info code to avoid duplication and be more