FIX: remove unused import
FIX: use interface List<..>
FIX: removed ArrayList
FIX: removed unnecessary store
FIX: returning empty collection instead of null
FIX: removed public ctor from utility class
FIX: removed unused prv field