minor changes to the layout of othe code