Refactory the code, using better method to override the style