Minor cleanup and simplifications