Bit of cleaning up, debugging.