Improve Logs and do other cleans