XML redone to look super neat