Update

Tidying up a bit.