changes to structure and style to better match itarch