indentation and tag cleanup