clean up, plus flip