[REF] Code refactor