Refactored rectangle bitmap