Removed all Character.valueOf & replaced items with OD names