Small reorganizations/simplifications