Linting errors + fixing 'new' cleaner not having an id