Cleanup, reformat