Refactor the bullet classes