[TASK] KYC: Refactored code