Refactored draw