Review based changes
  - Possible extraneous memory alloc
  - whitespace fixes