Merge "More refactoring"