Merge "Refactoring to make next commit clearer"