Major cleanup on plugin and client
Merge pull request #49 in CHOP/main from cleanup to two-dot-o

* commit '49600dd22dd97af4ce1adf2d94ea0b9bbc3e129d':
  Major cleanup on plugin and client