fixes following code review