Moved width and height to variables