Finalized States, tidied up.