Make the code a little cleaner