Merge "Code refactoring."