Addressed code review remarks