More massaging of the code