massive clean-up. renamed to outline.