add listing helper
small modify
thru
remove duplicate code