changed size of collection
refactor
deleting unused code
minor style changes
bugfix on cell identifier