Merge "Clearing code smells"