refactor: clean up the styles #3
Merge branch 'clean-up'