Refactor of shooter