Yes, that is even better. This would remove even more code.