Refactored code, added Bullet class