Finish up formatting & validation system