Refactor/styles