Bump version
Comment cleanup