inventory stacking, removing, code cleanup
Signed-off-by: Patrick <Patrick@192.168.1.104>