Clean up a little bit for the next move