Various whitespace fixes and revert zap to GPP