Merge "Improve code quality:"