reformatting and clean up