Addressed code review comments