lint warnings fixed