more  code refactoring