xml and styles cleanup