Tidying up submission