lint and str fix