Some more code cleanup. Status now returns a list of dict()