Make coding style consistent, fix incompatibililty with short open tags