Comments and a small perf boost