Code review misc code style and a few TODOs.