Polished Code a bit.