Fixed changes from code review