Merge "Some refactoring of the code."