Cleaned Code for Deployment