Merge "lower code smells"