[cleaning] separating apply attribtues logic