Refactoring of Bullet and Gun