Simplifies state handling further