added loging
cleanup