Sure -- though with such a big diff already I tried to keep the cleanups to a minimum to keep it reviewable :).