Fixed header order to satisfy linter