small updates in structure after angular patterns