small improvements
Changed call alert
Visible code refactoring