continue fixing issues from lint