Small cleanups
Small simplifications