Code refactor
Code refactor