- refactoring code