Completed Refactor (WHFF, Bitmap)