Refactoring width and height