Small refactors in InventoryWindow code