EDWPBAT-481: edits after code review (part1)