Tidy up some use of modifiers
Fix sloppy use of modifiers in ID