perf: Move some code around