A little refactoring on the styles