Code cleanup
More code cleanup
Revise version. Not sure on approach if module is both on d.o and on github.