Code re-factoring in Style.