continued validator implementation and some style adjustments.