Now works with ST3; fixed some PEP-8 validation errors