Resolve cyclomatic complexity in evaluate