cleanup / reformatting