Whitespace and PE8 cleanup