Fixed a minor drawing bug, cleaning up the draw method