Tidyup, ready for optimization
Implemented DrawRect optimization