Some last cleanup of justify.py