reorganized call statements; removed inline statements