refactor the code
refactor the code