Tidying up ready for States to be added