Cleaning up a bit and typo fix.