Cleanup comments and tests
Bump version