Merge "removed code smells"