Make the code a little less ugly