Simplify, remove -n and always print names if -a is specified