Merge "Some code refactoring."