Fixing lint issues and rules