Tidy up the comments and remove a #pragma optimize off I left in.