address PR feedback
fix quality issues