ws, unused imports
Cosmetic changes (method extraction in BackingMap)