Slight refactor. Bump version.