Major reformatting.