Rearranging solution and cleanup