Refactorign styles