Fix a DS and code styling from item model