Clean up

Slight updates to reflect things that have changed