Improve a bit more the design (thanks rbr)