Reformatting and cleanup.