Split a little more the code