Team tweaked code, cleaning up controller and adding .env