Small simplifications & cleanups