Misc. code review comments and changes