Small cleanups and simplifications