Resolved lint issues