Cleanup

Some clean up of the lib