Merge "Reduce Cyclomatic Complexity"