Merge "Code refactoring"