refactoring bitchs