Merge "Removing code smells"

No match.