Addressed concerns from code review