Cleaned up the code.

Got rid of the Item classes for now. Will work on them later.