Made the code a bit prettier