Refactoring and remove `fill-width` class