Minor refactoring, bump for sem-ver