further lint fixing