Fixed minor issues based on code review