Remove remaining globals and collect results in one place

Signed-off-by: Eric Malm <emalm@pivotallabs.com>