Yep, agree. For a matter of readability too.