tidying up method section