Code review comments, mostly code clean up