Refactor toasting