Cleaned up Code part 2

Added Item code from main to item. Deleted two unneeded functions