some minor changes in high-quality-code approach