Move towards better styles