Improve styles structure