cleaned up code removed some toast messages