Made the code a bit more beautiful