Some code layout clean up