Fixing lint issues (ignoring 80 characters)