Fixes part1 from code review