Clean code and add "BOUM !!!" dialog Message Box