one last request: please fix up the cosmetics here, in a separate commit. cheers