Renamed functions to be more descriptive.

cleaned up inventory management, cleaned up user interfacing.