Moved API keys to file, small cleanup