Add inventory class for avatar. Some cleanups…