Small code improvements & cleanup
Started implementing List and Item