Code refactoring.
code refactoring