a couple more clean ups - not looking bad now