refactoring - removing of duplicate code from _list_* methods