Tidied up commits for public facing modules.