Fix up some comments and micro-optimise