main: minor code maintenance.

Removed a todo, fixed output file name generation...