Merge "Removing code smells"