Refactor to allow plugin use without invocation
Remove debug line
Merge pull request #1 from jameswyse/refactor

Allow plugin use without invocation