Clean code + fixes for ItemList