Making Code pylint Friendly

Making Code pylint Friendly