style changes acc. new SOP
fixing build errors