Cleanup

Hi I found your library very useful and would like to help you to maintain.
If you don't mind.