a little more tidy