A bit of refactoring (Created inventory package) and some inconsequential technical changes.