Improve a filename method