validation cleanup
cleanup/refactoring