Tiding up the markup and JS code a little bit ☕️