Merge "fixing code smells"