VE-599 responding to CR feedback mainly re: whitespace