[#2298] changes per code review, and astyle