toaster, refactoring