Code cleanup and trying toast when uploaded (not working)