tidying and commenting