Addressed some code review feedback.