cleaning up code, getting rid of API keys