Yes you are right, that's a good idea, much more concise.