housekeeping: device width refactoring