Suggestion for cleaner code

That should really be the default, but, you know, "R".