More validation and code reorganization.