Cleaned up draw.js