* Also some trivial cleanup of spacing to undo poor formatting decisions of the past. Signed-off-by: stack <stack@apache.org> Signed-off-by: Sean Busbey <busbey@apache.org>