cleanup
Final state is now highlighted too