Cleaned up code for API.#1

serpulga wants to merge 2 commits into

threatstream:masterthreatstream/threatstream-api:masterfrom

serpulga:masterserpulga/threatstream-api:masterCopy head branch name to clipboard