Merge "flake 8 fix + add logger"