refactoring code

179be14