Merge "Minor refactoring prior to major refactoring."