Refactoring code.
refactoring code