Add consistency and some clean up.