minor changes and cleanups