re-write the exisiting code to make the lint happy