setImageWidth and setImageHeight removed since it was not used
cleaned up code / comments