fix quality flaws
fix quality flaws