some simple housekeeping

only real change: Use null for nullable parameters if we have no data instead of creating empty and unused list/set objects