Refactor BitmapData