Addresed Gian's code review