Minor code cleanup, return empty lists instead of None