Use aged containers in Validators module (RIPD-349)
Tidy up sources