Cleaaed up a bit.