minor cleanup (indentation, removal of some extraneous tags)