Remove unneeded macro and put filename argument first