Address various Code Review feedback