cleaned and formatted stuff