Extract initial_state method
Give states names
Remove unused rule