changes some indentation and improves optional tags