improvements in code layout...more to come...