Change style
Improve flow