Use single-dash only for class names
Improve modal event names
Use show()/hide() and remove blank lines