Make it a little neater