Cleanup code especially onDraw method