Adding much better fix for the lint issues.