cleaned up desired_state, a bit