Remove pep8 complains.
Add error messages for other execution plans where there is not standard repo