little more polish before next code review patch