Small simplifications