Cleaning up state provider syntax