diff --git a/examples/units/bar_demo2.py b/examples/units/bar_demo2.py
index 325915e92a10..a77ea0c9f7ba 100644
--- a/examples/units/bar_demo2.py
+++ b/examples/units/bar_demo2.py
@@ -15,26 +15,21 @@
 from basic_units import cm, inch
 import matplotlib.pyplot as plt
 
-
 cms = cm * np.arange(0, 10, 2)
-bottom = 0*cm
-width = 0.8*cm
+bottom = 0 * cm
+width = 0.8 * cm
 
-fig = plt.figure()
+fig, axs = plt.subplots(2, 2)
 
-ax1 = fig.add_subplot(2, 2, 1)
-ax1.bar(cms, cms, bottom=bottom)
+axs[0, 0].bar(cms, cms, bottom=bottom)
 
-ax2 = fig.add_subplot(2, 2, 2)
-ax2.bar(cms, cms, bottom=bottom, width=width, xunits=cm, yunits=inch)
+axs[0, 1].bar(cms, cms, bottom=bottom, width=width, xunits=cm, yunits=inch)
 
-ax3 = fig.add_subplot(2, 2, 3)
-ax3.bar(cms, cms, bottom=bottom, width=width, xunits=inch, yunits=cm)
-ax3.set_xlim(2, 6)  # scalars are interpreted in current units
+axs[1, 0].bar(cms, cms, bottom=bottom, width=width, xunits=inch, yunits=cm)
+axs[1, 0].set_xlim(2, 6)  # scalars are interpreted in current units
 
-ax4 = fig.add_subplot(2, 2, 4)
-ax4.bar(cms, cms, bottom=bottom, width=width, xunits=inch, yunits=inch)
-# fig.savefig('simple_conversion_plot.png')
-ax4.set_xlim(2*cm, 6*cm)  # cm are converted to inches
+axs[1, 1].bar(cms, cms, bottom=bottom, width=width, xunits=inch, yunits=inch)
+axs[1, 1].set_xlim(2 * cm, 6 * cm)  # cm are converted to inches
 
+fig.tight_layout()
 plt.show()