More PEP8
Add API_KEY support