revert whitespace, 1D/2D/3D claw_packge init fixes