Return mapping from validate
Clean up macro formatting