structure overhaul / clarification