Refactor styling