Little refactorings
Fix Draw condition confirmation