Toast refactoring