clean and add better log helper