Refactoring in readiness for next release