Reindent/reorder; remove "class" attribute from dependent