initial tidying