Refactor fill setting into a separate method