Replace device width with just width