I'm  not sure if it will be more readable this way. Anyone else has an opinion ?