Breaking up size

Sizes modified to be width and height variables, for convention