Fix up linting issues
Sort parameters