Updated to proper API key.
Minor tweaks and code cleanup.