first pass at cleaning up conditionals for ItemBuilders