Refactor for for easier management of API Key