Style boost and order new refactor