Further Toast improvement and cleanup