let's make it neater