Make the code a little neater