Change: Whitespace and policy syntax cleanup