Restrict return to non-argument expressions
Add variable n as cli
Print file name with long class
Add class name to results