Code cleanup and fixes for https://github.com/DamienOReilly/My3Usage/issues/1