small cleanup, code now eval'ed in Main