fixes in accordance with code review