Cleanup comments and bump version