Unnecessary Toasts removed
Refactoring