Updated it to meet code review requirements