Minor refactoring.
Preparing release