couple of cleanups