Made drawing slightly more modular