Fixed a bug, prettified a bit.