Merge "Refactor the code."