Cleanup

Some cleanup to the module and the documentation.
You should have told me this before merging :) Fixing in next pull request.