removes expand_attrs(); white space updates;