removed alert message and some cleaning