Refactor shot creation