Minor reductions and cleanups