overall small improvements and cleanups