Made the code neater. Seeing it killed me a little inside.