Address a couple of code read issues.
Clean up some code review issues