Removed XML for good, also: formatting