last lint warnings fixed