performance: Code review cleanup tweaks