ST3 support and pep8 white space fixes