Added Dimensions and Cleaned Up