New graph model and PEP8 fixes.