fix for code review comments