Refactor stylesheet