To keep the style readable
Some template cleanup;