Sync: changed lint options & updated files