Correcting comment
Apply code review comments - fix up commenting, clearer names and typedefs.