Cleaned draw.js