Fix issues as per pep8 python standards