Added comments back in, and tidyied up a bit.