implement code cleanup in inc files of the category listing module