Some commenting, some linting