Organization and heading fixes.