Merge "Refactoring"