Light refactor. Version bump