refactor validity check on feedback