Merge "Fixed all Flake8 errors"