[FEATURE] KYC: Code refactor