validation refactor step #1