some short clean ups