Cleaned up code, merged drawString with draw