Jeff - refactor commodity display strategies