applied more refactoring to make feedback plug-in reusable for
commercial products