Chat polish, separate function etc