minor clean-up and laying out for further modifications