Target category and app by name + nit comment cleanup

Addresses issue #520