refactored validations
cleaning up...ltw