List skips current file.

Also variables names are now more accurate.