Clean up
Fix Shift operations breaking while once analysis