fix linting and order alphabetically