Beautified and cleaned the code a bit.