Clean up code logic surrounding which eq to start