Merge "decreased code smells"