Bump version, minor cleanup