Clean

We cleanded up some of the classes and the item constructor parameters.