Yes, I like your suggestion. This means less code.