Better coverage and cleanups