tidying and checking