Minor algorithmic tweaks, better factoring, improved docstrings and variable names