feat(lint): Fix and simplify linting