Addressed code review feedback