Partial recode to improve overall performance of this plugin.

There have been a number of quick releases over the last few months with additions to functionality - this release optimizes the code behind these additions to ensure the best possible performance of the plugin