Code cleanup in Validation Module