Refactoring - no functional changes.