Minor changes
Refactoring to use util width and height