code cleanup, now using {}initialization!