Merge "zhtable makefile: Remove unused variables, fix almost all pep8 errors"