Refactor and bump version.