Bullet refactoring