Clean up a bit

There's still a lot to do, this module is a huge mess.
Bump version number