Refactor styling strategy