Refactor/class styles