Reformat/clean up