cleaned up state mapping