Some cleanup in structure