Moved drawing code from Main into respective class