shooters refactoring