cleaning up for validation