more Bullet refactoring