Content size fixed
Refactoring