Fix small issues and add pep8 env to tox

Change-Id: Ic6572c85d5f847c744be41850246517f4d25ee90