Refactor, bullet error