New API key + Clean Up