Code review feedback, general clean up.