Cleanup, clarification, reorganization