Refactor of styles