Fix quality flaws
Fix quality flaws