Third wave of code clean: put toasts