I have rewritten it like you said :)