Fix some quality flaws
Fix some quality flaws