Changes follwing code review