Tidied up work on actions