A PEP8 run-through
Add support for sta.sh