Refactor bullets