Merge "Some code refactoring"