Indeed, it should simplify the code. Thanks for the code review!