Better main handling; remove 'Fn' alias