Beautified and cleaned up.