moved width and height into class