Change order so parameters are first (best practice)