Nit: consistent pointer variable declarations.
Update completed TODO and comment out floating point constants.