few more clean ups