some first clean up/out changes