Review actions - tidied up private helper functions.