cleaned code and added ListOfItems