Bullet class refactoring