Remove unused variable and PEP8