Cleanup code
Create new validate command