Bullet refactor