Small cleanups & simplifications