update xmlns + beautifying