Code cleanup: added drawing methods