minor cleanupss