minor cleanup after code review