NB-12 Use Revealing Module Pattern - tidied up.