Some cleanup on manual structure