gofmt fixes
Changing param order for consistency