Cleaned up code. Deployed and validated.