cleaning: remove list() where no need for it