Fix quality flaw
Fix quality flaws