clean up code, looking for way to trigger draw without timer