Minor perf optimization