some code cleanups, bump version